Merge branch 'non-recursive-activate' of https://github.com/jyasskin/cargo
authorAlex Crichton <alex@alexcrichton.com>
Mon, 21 Sep 2015 16:17:37 +0000 (09:17 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Mon, 21 Sep 2015 16:17:37 +0000 (09:17 -0700)
commitd1d15a92cfd4c3f629c3a4f409915744563ad82d
treea00325633604f3767cf3d992322f649ca5d745a4
parent4080ea8c9c6195f754b5523c53bb92cf5ff96699
parentaa3005f5243a708bf9117f336863fab02e610c21
Merge branch 'non-recursive-activate' of https://github.com/jyasskin/cargo
src/cargo/ops/cargo_package.rs